Add a function to load css from a resource

This is common enough that we should just provide an API for it
- we already had a function for this purpose anyway.

https://bugzilla.gnome.org/show_bug.cgi?id=672946

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index de04e7ff52ff58c1b71de53cb16d11723656e43c..c7d53755bf58e474a0c7fc66ebd39e2e9acd0862 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -6158,6 +6158,7 @@ gtk_css_provider_get_named
 gtk_css_provider_load_from_data
 gtk_css_provider_load_from_file
 gtk_css_provider_load_from_path
+gtk_css_provider_load_from_resource
 gtk_css_provider_new
 gtk_css_provider_to_string
 GTK_CSS_PROVIDER_ERROR

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 8d6b216d19012655c187cc0a9e25cf2b4ea102ed..62fde1cb42c20a4b715ad155fe8035e6e79d403d 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2883,12 +2883,26 @@ gtk_css_provider_load_from_path (GtkCssProvider  *css_provider,
   return result;
 }
 
-static void
-gtk_css_provider_load_from_resource (GtkCssProvider  *css_provider,
-                                    const gchar     *resource_path)
+/**
+ * gtk_css_provider_load_from_resource:
+ * @css_provider: a #GtkCssProvider
+ * @resource_path: a #GResource resource path
+ *
+ * Loads the data contained in the resource at @resource_path into
+ * the #GtkCssProvider, clearing any previously loaded information.
+ *
+ * If there is an error locating the resource or parsing the CSS,
+ * then the program will be aborted.
+ *
+ * Since: 3.16
+ */
+void
+gtk_css_provider_load_from_resource (GtkCssProvider *css_provider,
+                                    const gchar    *resource_path)
 {
   GFile *file;
-  char *uri, *escaped;
+  gchar *uri, *escaped;
+  GError *error;
 
   g_return_if_fail (GTK_IS_CSS_PROVIDER (css_provider));
   g_return_if_fail (resource_path != NULL);
@@ -2901,7 +2915,8 @@ gtk_css_provider_load_from_resource (GtkCssProvider  *css_provider,
   file = g_file_new_for_uri (uri);
   g_free (uri);
 
-  gtk_css_provider_load_from_file (css_provider, file, NULL);
+  if (!gtk_css_provider_load_from_file (css_provider, file, &error))
+    g_error ("Failed to load CSS: %s", error->message); 
 
   g_object_unref (file);
 }

diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h
index 4cf2f5105a52ca551a3503748190fd1b7c6031a0..818173128b2ed1f727c1d9bc20501bf3714eb6d2 100644 (file)
--- a/gtk/gtkcssprovider.h
+++ b/gtk/gtkcssprovider.h
@@ -103,6 +103,10 @@ gboolean         gtk_css_provider_load_from_path (GtkCssProvider  *css_provider,
                                                   const gchar     *path,
                                                   GError         **error);
 
+GDK_AVAILABLE_IN_3_16
+void             gtk_css_provider_load_from_resource (GtkCssProvider *provider,
+                                                      const gchar    *resource_path);
+
 GDK_AVAILABLE_IN_ALL
 GtkCssProvider * gtk_css_provider_get_default (void);